From bc2bac842389d9ce3c75d97000e39ac19ccbf4ea Mon Sep 17 00:00:00 2001 From: robertl Date: Tue, 5 Nov 2002 02:19:29 +0000 Subject: [PATCH] Rename our "round" to "si_round". --- gpsbabel/defs.h | 2 +- gpsbabel/gpspilot.c | 6 +++--- gpsbabel/magnav.c | 4 ++-- gpsbabel/util.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h index 1710e10e6..6c8629a0e 100644 --- a/gpsbabel/defs.h +++ b/gpsbabel/defs.h @@ -202,7 +202,7 @@ char * xstrdup(const char *s); * to deal with possible floating-point representation errors. */ -signed int round( double d ); +signed int si_round( double d ); /* * Data types for Palm/OS files. diff --git a/gpsbabel/gpspilot.c b/gpsbabel/gpspilot.c index f6e508ed8..80fa6749b 100644 --- a/gpsbabel/gpspilot.c +++ b/gpsbabel/gpspilot.c @@ -128,9 +128,9 @@ gpspilot_writewpt(waypoint *wpt) rec = xcalloc(sizeof(*rec)+46,1); - be_write32(&rec->longitude, round(wpt->position.longitude.degrees * 3.6e6)); - be_write32(&rec->latitude, round(wpt->position.latitude.degrees * 3.6e6)); - be_write16(&rec->elevation, round(wpt->position.altitude.altitude_meters)); + be_write32(&rec->longitude, si_round(wpt->position.longitude.degrees * 3.6e6)); + be_write32(&rec->latitude, si_round(wpt->position.latitude.degrees * 3.6e6)); + be_write16(&rec->elevation, si_round(wpt->position.altitude.altitude_meters)); be_write16(&rec->magvar, 0 ); vdata = (char *)rec + sizeof(*rec); diff --git a/gpsbabel/magnav.c b/gpsbabel/magnav.c index 3e0c5c059..93de8a7cc 100644 --- a/gpsbabel/magnav.c +++ b/gpsbabel/magnav.c @@ -173,8 +173,8 @@ my_writewpt(waypoint *wpt) be_write16( &rec->unknown2, 0); - be_write32(&rec->longitude, round(wpt->position.longitude.degrees * 100000.0)); - be_write32(&rec->latitude, round(wpt->position.latitude.degrees * 100000.0)); + be_write32(&rec->longitude, si_round(wpt->position.longitude.degrees * 100000.0)); + be_write32(&rec->latitude, si_round(wpt->position.latitude.degrees * 100000.0)); be_write32(&rec->elevation, wpt->position.altitude.altitude_meters); rec->plot = 0; diff --git a/gpsbabel/util.c b/gpsbabel/util.c index b74767862..190920290 100644 --- a/gpsbabel/util.c +++ b/gpsbabel/util.c @@ -171,7 +171,7 @@ le_write32(void *addr, unsigned value) } signed int -round( double d ) +si_round( double d ) { if ( d < 0 ) { return (signed int)(d-0.5); -- 2.30.2